testsuite: Don't use ::key-press-event
authorMatthias Clasen <mclasen@redhat.com>
Wed, 31 Jan 2018 11:35:05 +0000 (12:35 +0100)
committerCarlos Garnacho <carlosg@gnome.org>
Thu, 5 Apr 2018 17:26:53 +0000 (19:26 +0200)
We don't need it here.

testsuite/gtk/window.c

index ba289f2446121a8e46c5ecdc397134423e88c9b1..758c10802dd5fade6a021172db72dcd5a5a2a1e4 100644 (file)
@@ -40,11 +40,13 @@ on_draw (GtkDrawingArea *da,
 }
 
 static gboolean
-on_keypress (GtkWidget *widget)
+on_keypress (GtkWidget *widget,
+             GdkEvent  *event)
 {
-  gtk_main_quit ();
+  if (gdk_event_get_event_type (event) == GDK_KEY_PRESS)
+    gtk_main_quit ();
 
-  return TRUE;
+  return GDK_EVENT_PROPAGATE;
 }
 
 static void
@@ -56,7 +58,7 @@ test_default_size (void)
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   if (interactive)
-    g_signal_connect (window, "key-press-event", G_CALLBACK (on_keypress), NULL);
+    g_signal_connect (window, "event", G_CALLBACK (on_keypress), NULL);
 
   da = gtk_drawing_area_new ();
   gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (da), on_draw, NULL, NULL);
@@ -133,7 +135,7 @@ test_resize (void)
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   if (interactive)
-    g_signal_connect (window, "key-press-event", G_CALLBACK (on_keypress), NULL);
+    g_signal_connect (window, "event", G_CALLBACK (on_keypress), NULL);
 
   da = gtk_drawing_area_new ();
   gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (da), on_draw, NULL, NULL);